Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert UMD for now, due to #13812. #13904

Merged
merged 1 commit into from
Jun 24, 2014
Merged

Revert UMD for now, due to #13812. #13904

merged 1 commit into from
Jun 24, 2014

Conversation

cvrebert
Copy link
Collaborator

Revert UMD (#13772 & friends) for now, due to #13812.

We'll hopefully be able to revert this reversion and land a fully-working version of UMD in v3.3.0, after we figure out a solution for #13812. But right now, we just want to get v3.2.0 shipped already, since it's late, and UMD is our sole blocker at this point.

To: @fat @XhmikosR for review.

For less confusion, I recommend reading the whitespace-ignorant diff:
https://github.com/twbs/bootstrap/pull/13904/files?w=1

Will hopefully revert this reversion and land a fully-working version of UMD in v3.3.0.

Revert "some changes from #13801 - add strict mode back and =="
This reverts commit 2b302f6.

Revert "Fix regression of #10038 introduced by #13772"
This reverts commit e9d6756.

Revert "MD/CommonJS/Globals #12909"
This reverts commit 1c6fa90.

Revert "address #13811"
This reverts commit f347d7d.

Conflicts:
    js/carousel.js
    js/collapse.js
    js/dropdown.js
    js/modal.js
    js/tab.js
    js/tooltip.js
@cvrebert cvrebert added the js label Jun 23, 2014
@cvrebert cvrebert added this to the v3.2.0 milestone Jun 23, 2014
@hnrch02
Copy link
Collaborator

hnrch02 commented Jun 23, 2014

👍

@XhmikosR
Copy link
Member

LGTM too.

@fat
Copy link
Member

fat commented Jun 24, 2014

cool, thanks for doing this @cvrebert

fat added a commit that referenced this pull request Jun 24, 2014
@fat fat merged commit b31c35b into master Jun 24, 2014
@fat fat deleted the revert-umd branch June 24, 2014 05:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants